ChangeLog merge fix, grumble.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4ba1884633df8e1dee4c673ee1fe04bb868617cf..9e8d6e0f2837907e880c3c02599cdcec09d2540d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,8 +1,3 @@
-2011-05-05  Daniel Colascione <dan.colascione@gmail.com>
-
-       * progmodes/cc-engine.el (c-forward-decl-or-cast-1): Use
-       correct match group (bug#8438).
-
 2011-05-05  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        Fix earlier half-done eieio-defmethod change (bug#8338).